Modified Problem 2 and Started Problem 1