Updated ToDo again, do check