Updated problem 1