diff --git a/TODO b/TODO
index f1fa5239f..9b803822a 100644
--- a/TODO
+++ b/TODO
@@ -5,3 +5,9 @@ TODO 2. emqttd_router, emqttd_pubsub to route message
 
 TODO 3. sup, pool_sup, manager......
 
+TODO 4. route ageing...
+
+TODO 5. dashboard
+
+TODO 6. emqttd_ctl
+
diff --git a/src/emqttd_pubsub.erl b/src/emqttd_pubsub.erl
index 1971150de..73058a0b2 100644
--- a/src/emqttd_pubsub.erl
+++ b/src/emqttd_pubsub.erl
@@ -229,7 +229,7 @@ handle_call({subscribe, {SubId, SubPid}, TopicTable}, _From, State) ->
     %% Add subscriptions
     case mnesia:transaction(fun add_topics/1, [TRecords]) of
         {atomic, _} ->
-            %% store subscription
+            %%TODO: store subscription
             %% mnesia:async_dirty(fun add_subscriptions/2, [SubId, TopicTable]),
             {reply, {ok, [Qos || {_Topic, Qos} <- TopicTable]}, State};
         {aborted, Error} ->