Updated Version and Todolist