Problem 6
Problem 2 fixed