Slightly fixed problem 1