moved todo to the correct place