diff --git a/Tasks-Roadmap.md b/Tasks-Roadmap.md
index e4aece3c..7bb685de 100644
--- a/Tasks-Roadmap.md
+++ b/Tasks-Roadmap.md
@@ -1,36 +1,35 @@
-## October 1st ##
-* Source code , layout/handling  EWR  (**jfiat**)
-* "Eiffel WSGI" spec  (github wiki) (**paco**)
-* Eiffel Web Nino (**jvelilla**)
-* REST component (**jfiat**)
-* Example/reference Eiffel Web Server App (**jvelilla**)
-    - Hello World
-    - Restbucks  (from the book REST in Practice)
-* WAMIE/apache based support for Eiffel WSGI  (**daro**)
-    - SCOOP ...
-* Some persistance solution (**daro**)
-* XML, [[JSON|Task-JSON]] support  (**jvelilla**)
+## Future
+* Focus on REST API
+    - Hypermedia API
+    - HAL, Collection/JSON ...
+    - ATOM, RSS, XHTML, ... ?
+* Extend WSF with libraries addressing common needs
+    - Logging
+    - Caching
+    - Security (authentication) + OAuth (consumer+provider) + OpenID?
+    - Filter chain
 
-## Maybe for October 1st ##
-* Reference Client/REST-service consumer (**jfiat**)
-* Mashup support, facebook, twitter, google+, ...  (**jfiat**)
-* Authentication support (**jfiat** ?)
-    - OpenID, Google Connect, Facebook Connect, OAuth, ...
-    - http authorization
+* Start thinking about application friendly libraries
+    - Template engine
+    - State machine
+    - HTML5 (XHTML+JS) generation for widgets (table, suggestive box, ...)
+    - Google API, Twitter API, ... ?
 
-## December ##
-* Session handling
-     - Cookie based
-     - REST-based session example
-* Access Control
-* Application builder
-     - Deployment
-     - Persistence chooser
-* Dynamic update of running system   (**daro**)
+* Improve documentation
+    - WSF documentation + tutorial
+    - Topic: how to contribute ?
+    - Example: add a "graphviz server" example, which will demonstrate an REST Hypermedia API, with logging, caching and security
+
+## Version 0.1 june 2012 ##
+* "Eiffel WSGI" spec
+* Core of Eiffel Web Framework 
+    - EWSGI connectors: CGI, libfcgi, Nino
+    - WSF: request, response, router 
+    - And utility lib, error, http, encoders, ...)
+* Examples
+* Documentation (tutorial inside the examples folder)
+* Installation scripts
 
 ## Contributors ##
   - See [[the collaboration page|Community-collaboration]] 
 
-note: In bold, you see the responsible for each task, but contribution from other is possible as well.
-
-This needs updating, I think.
\ No newline at end of file