Finishing assignment 3