Problem 2 added to main file