Finish the assignment 2