Updating solution to problem 17