Finish the tasks

that I started