Done assignment 2