Problem 4 and 6 commit