Problem 3 merged into master