More advanced activity indication and two new TODOs in controller