diff --git a/presentation/chapters/system.tex b/presentation/chapters/system.tex
index c36da69..dfd5326 100644
--- a/presentation/chapters/system.tex
+++ b/presentation/chapters/system.tex
@@ -1,5 +1,18 @@
+\newcommand{\mPosAP}{\varrho}							% char for access point position vector
+\newcommand{\mPos}{\rho}								% char for positions
+
+
 \newcommand{\mPosVec}{\vec{\mPos}}						% position vector
+\newcommand{\mRssi}{s}							% client signal strength measurements
 \newcommand{\mRssiVec}{\vec{s}}							% client signal strength measurements
+\newcommand{\mRssiVecWiFi}{\vec{s}}							% client signal strength measurements
+
+\newcommand{\mPLE}{\ensuremath{\gamma}}					% path-loss exponent
+\newcommand{\mTXP}{\ensuremath{P_0}}					% tx-power
+\newcommand{\mWAF}{\ensuremath{\beta}}					% wall attenuation factor
+\newcommand{\mGaussNoise}{\ensuremath{\mathcal{X}}}
+
+\newcommand{\mMdlDist}{\ensuremath{d}}					% distance used within propagation models
 
 \newcommand{\mState}{q}									% state variable
 \newcommand{\mStateVec}{\vec{q}}						% state vector variable
@@ -24,10 +37,22 @@
 \newcommand{\R}{\mathbb{R}}
 %\newcommand{\N}{\mathbb{N}}
 
-\begin{frame}[fragile]
-	\frametitle{System}
-	
-	%\includegraphics[width=4cm]{gfx/map1}
+
+\section{Indoor Lokalisierung}
+
+	\subsection{Überblick}
+	\begin{frame}[fragile]
+	  \frametitle{Indoor Lokalisierung}
+
+	  \begin{figure}
+		\centering
+		\includegraphics[width=\linewidth]{gfx/info_graphic}
+	  \end{figure}%   
+	  
+	\end{frame}
+
+	\begin{frame}[fragile]
+		\frametitle{Indoor Lokalisierung}
 	
 		\small
 		
@@ -73,7 +98,57 @@
 				p(\mStateVec_{t} \mid \mStateVec_{t-1}, \mObsVec_{t-1}) &= \text{Bewegungsmodell mit Zusatzwissen}
 			\end{aligned}
 		\end{equation*}
-		
-		
 	
-\end{frame}
+	\end{frame}
+
+	\subsection{Bewegungsmodell}
+	\begin{frame}[fragile]
+		\frametitle{Bewegungsmodell}%   $p(\mStateVec_{t} \mid \mStateVec_{t-1}, \mObsVec_{t-1})$  }
+		%\emph{Wo könnte ich in 10 Sekunden sein?}
+		
+		%
+		\centering\includegraphics<1>[height=6cm]{gfx/plan1.pdf}%
+		\centering\includegraphics<2>[height=6cm]{gfx/plan2.pdf}%
+		\centering\includegraphics<3>[height=6cm]{gfx/importance.pdf}%
+		\centering\includegraphics<4>[height=6cm]{gfx/dijkstra.pdf}%
+		\centering\includegraphics<5>[height=6cm]{gfx/map1}%
+		
+		
+	\end{frame}
+
+	\subsection{Sensorik}
+	\begin{frame}[fragile]
+		\frametitle{Sensorik - Wi-Fi}
+		
+		\begin{equation*}
+			p(\vec{o}_t \mid \vec{q}_t)_\text{wifi} = 
+			p(\mRssiVecWiFi \mid \mPosVec) =
+			\prod_{\mRssi_{i} \in \mRssiVec{}} p(\mRssi_{i} \mid \mPosVec)
+			\footnote{\tiny Annahme: Messungen von Access-Points sind statistisch unabhängig}
+			,\enskip
+			%\mPos = (x,y,z)^T
+			\mPosVec \in \R^3
+			%\label{eq:wifiObs}
+		\end{equation*}
+		%
+		\begin{equation*}
+			p(\mRssi_i \mid \mPosVec) = 
+			\mathcal{N}(\mRssi_i \mid \mu_{i,\mPosVec}, \sigma_{i,\mPosVec}^2)
+			%\label{eq:wifiProb}
+		\end{equation*}
+		%
+		\begin{equation*}
+			\mRssi = {\mTXP{}} - 10 \mPLE{} + \log_{10} \frac{d}{d_0} + n \beta + \mGaussNoise{}
+			%\label{eq:logDistModel}
+		\end{equation*}
+
+		\includegraphics[width=4.5cm]{gfx/fingerprints.pdf}
+		\includegraphics[width=4.5cm]{gfx/opt.pdf}
+		\includegraphics[width=4.5cm]{gfx/wifiMultimodality.pdf}
+		
+	\end{frame}
+	
+
+
+
+	
diff --git a/presentation/chapters/toni.tex b/presentation/chapters/toni.tex
index 93d6e9c..b611b58 100644
--- a/presentation/chapters/toni.tex
+++ b/presentation/chapters/toni.tex
@@ -16,8 +16,10 @@
   
 \end{frame}
 
+\subsection{Smoothing}
+
 \begin{frame}[fragile]
-  \frametitle{Indoor Localisation System}
+  \frametitle{Indoor Localization System}
 
   \begin{figure}
 	\centering
diff --git a/presentation/gfx/dijkstra.pdf b/presentation/gfx/dijkstra.pdf
new file mode 100644
index 0000000..663cb5a
Binary files /dev/null and b/presentation/gfx/dijkstra.pdf differ
diff --git a/presentation/gfx/fingerprints.pdf b/presentation/gfx/fingerprints.pdf
new file mode 100644
index 0000000..6172194
Binary files /dev/null and b/presentation/gfx/fingerprints.pdf differ
diff --git a/presentation/gfx/importance.pdf b/presentation/gfx/importance.pdf
new file mode 100644
index 0000000..ddd243b
Binary files /dev/null and b/presentation/gfx/importance.pdf differ
diff --git a/presentation/gfx/opt.pdf b/presentation/gfx/opt.pdf
new file mode 100644
index 0000000..d49761c
Binary files /dev/null and b/presentation/gfx/opt.pdf differ
diff --git a/presentation/gfx/plan1.pdf b/presentation/gfx/plan1.pdf
new file mode 100644
index 0000000..0eb88cf
Binary files /dev/null and b/presentation/gfx/plan1.pdf differ
diff --git a/presentation/gfx/plan2.pdf b/presentation/gfx/plan2.pdf
new file mode 100644
index 0000000..f26f716
Binary files /dev/null and b/presentation/gfx/plan2.pdf differ
diff --git a/presentation/gfx/wifiMultimodality.pdf b/presentation/gfx/wifiMultimodality.pdf
new file mode 100644
index 0000000..bbde7ee
Binary files /dev/null and b/presentation/gfx/wifiMultimodality.pdf differ
diff --git a/presentation/presentation.tex b/presentation/presentation.tex
index 18e6aaf..6bdf012 100644
--- a/presentation/presentation.tex
+++ b/presentation/presentation.tex
@@ -74,6 +74,8 @@
 % https://en.wikibooks.org/wiki/LaTeX/Presentations
 %--------------------------------------------------------------------------
 
+\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
 \begin{document}
 
 	\maketitle
@@ -81,6 +83,8 @@
 	% TODO: remove examples!
 	%\input{chapters/examples.tex}
 	
+	\tableofcontents
+	
 	\input{chapters/bib}
 	
 	\input{chapters/achievements}