--- a/masqmail.tex	Mon Mar 02 15:15:06 2009 +0100
+++ b/masqmail.tex	Tue Mar 03 13:40:07 2009 +0100
@@ -336,36 +336,36 @@
 
 
 
-\frame{\ft{planned was}
-
-1) purpose and structure of an MTA/of masqmail
-
-2) security analysis
-
-3) code improvements
-
-4) documentation, test, distribution
-
-With the goal to release a new version and get it into Debian
-
-}
-
-
-\frame{\ft{however, it resulted in}
-
-1) introduction
-
-2) market analysis
-
-3) mail transfer agents
-
-4) masqmail's present and future
-
-5) improvement plans
-
-Became pretty theoretic (I don't worry)
-
-}
+%\frame{\ft{planned was}
+%
+%1) purpose and structure of an MTA/of masqmail
+%
+%2) security analysis
+%
+%3) code improvements
+%
+%4) documentation, test, distribution
+%
+%With the goal to release a new version and get it into Debian
+%
+%}
+%
+%
+%\frame{\ft{however, it resulted in}
+%
+%1) introduction
+%
+%2) market analysis
+%
+%3) mail transfer agents
+%
+%4) masqmail's present and future
+%
+%5) improvement plans
+%
+%Became pretty theoretic (I don't worry)
+%
+%}
 
 
 
@@ -473,7 +473,15 @@
 
 \frame{\ft{market shares}
 
-FIXME
+\input{tbl/mta-market-share.tbl}
+
+}
+
+
+
+\frame{\ft{comparison}
+
+\input{tbl/mta-comparison.tbl}
 
 }
 
@@ -545,30 +553,55 @@
 
 \frame{\ft{functional requirements}
 
+\input{tbl/func-requirements.tbl}
+
 }
 
 \frame{\ft{non-functional requirements}
 
-}
-
-\frame{\ft{architectural requirements}
+\input{tbl/nonf-requirements.tbl}
 
 }
 
-\frame{\ft{fulfilled requirements}
+\frame{\ft{work tasks}
+
+TODO\,1: Encryption
+
+TODO\,2: Authentication
 
-}
+TODO\,3: Security
+
+TODO\,4: Reliability
 
-\frame{\ft{work to do}
+TODO\,5: Spam handling
+
+TODO\,6: Extendability
+
 
 }
 
 
 \frame{\ft{further development}
 
+- improve existing code
+
+- add wrappers and interposition filters
+
+- redesign and rewrite from scratch
+
 }
 
 
+\frame{\ft{architecture}
+
+\begin{center}
+\includegraphics[width=0.8\textwidth]{fig/callgraph.eps}
+\end{center}
+
+}
+
+
+
 \frame{\ft{the result}
 
 ``one fits all'' is not possible