diff --git a/ROADMAP.md b/ROADMAP.md
index 3ce0c33f088..74a3a80b788 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,11 +1,10 @@
-# Roadmap (2017-08-29)
+# Roadmap (2017-10-31)
 
 This roadmap is a tentative plan for the core development team. Things change constantly as PRs come in and priorities change. 
 But it will give you an idea of our current vision and plan. 
 
 ### Short term (1-4 months)
 
- - Release Grafana v4.5 with fixes and minor enhancements 
  - Release Grafana v5
   - User groups
   - Dashboard folders
@@ -13,17 +12,25 @@ But it will give you an idea of our current vision and plan.
   - New Dashboard layout engine
   - New sidemenu & nav UX
   - Elasticsearch alerting
+  - React migration foundation (core components) 
+  - Graphite 1.1 Tags Support
   
-### Long term 
+### Long term (4 - 8 months)
 
 - Backend plugins to support more Auth options, Alerting data sources & notifications
-- Universal time series transformations for any data source (meta queries)
-- Reporting
-- Web socket & live data streams
-- Migrate to Angular2 or react
+- Alerting improvements (silence, per series tracking, etc)
+- Dashboard as configuration and other automation / provisioning improvements
+- Progress on React migration
+- Change visualization (panel type) on the fly. 
+- Multi stat panel (vertical version of singlestat with bars/graph mode with big number etc) 
+- Repeat panel by query results 
 
+### In a distant future far far away
+
+- Meta queries 
+- Integrated light weight TSDB
+- Web socket & live data sources
 
 ### Outside contributions
 We know this is being worked on right now by contributors (and we hope to merge it when it's ready). 
 
-- Clustering for alert engine (load distribution)