Fixed assignment 2