Problem 6 Final changes