Finish my assignment 2