More changes to the todo