reordering the TODO list a bit