Finished problem 3.
Merge fix