moved todo to the correct location