Follow the TODO mark in Controller