complete task#3 and modify TODO