Rework on Todo