Finish Solving Assignment 2