Problem 1 and 2 solved