Fixing some issues with the solution.
Assignment 2