More on the TODO