diff --git a/pages/roadmap.html b/pages/roadmap.html
index a3a476b6..64867d4d 100644
--- a/pages/roadmap.html
+++ b/pages/roadmap.html
@@ -1,58 +1,49 @@
-
0.3.2 (May)
+0.4 (August)
-- Fixed the netDb for more reliability
-- Address the diversification issues in peer selection
-- Fix remaining "unknown tunnels" cause
-
+- All previous code functional and reliable
+- New installer and deployment architecture
+- New web based console and configuration
+- Implementation docs for I2PTunnel, the SAM bridge, the router, and the SDK
+- Technical docs for the network describing the use cases, anonymity, and scalability attributes
-0.3.3 (July)
+0.4.1 (August)
- Unique tunnelIDs per hop to increase anonymity
-- Remove SourceRouteReplyMessage, replace SourceRouteBlock with ReplyBlock (no encrypted data in it, just a sessionTag + sessionKey)
-- Out of the 0.3.* testnet - irc, eepsites, and squid should work reliably
+- Remove the SourceRouteReplyMessage, replace the SourceRouteBlock with a ReplyBlock
+- Full ElGamal precalculation (instead of just 1/2 of it)
-0.4.0 (July)
+0.4.2 (September)
-- Updated deployment architecture, replacing the admin console with a real web server and
- allowing the integration of standard .war packages as client applications
-
-- New installer and web based config system
-- SAM bridge and client libraries implemented and tested
+- AMOC transport to allow operation behind firewalls and NATs without administrative control
-0.4.1 (July)
+0.4.3 (October)
-- AMOC transport to allow people behind firewalls/etc to fully participate in I2P
-- Bandwidth limiter functional
-
-- Router throttling code (detect/adapt to overload by refusing tunnels, shrinking # connections, minimizing networkDb activity)
+- UDP transport for scalable high connectivity
-1.0 (August)
+1.0 (November)
- Javadoc and code walkthrough / guidebook updated
-- Comprehensive management tool available
+- MyI2P available
- Internal code audit complete
-- MyI2P available
-
-1.1 (September)
+1.1 (December)
-- Full streaming protocol implemented
+- Full streaming protocol implemented with a moving window size
-2.0 (October)
+2.0 (March)
- Restricted route topology (include some connected peers in routerInfo, recursive route)
-- Connectionless/alternate transports (UDP, MRTCP, SMTP+POP3/IMAP)
- Nontrivial certificates (hashcash, other)
-3.0 (December)
+3.0 (June)
- Sender defined message delays
- Creator defined tunnel mixing and pooling of messages, as well as optional chaff messages