Problem 1

This is commit to fix problem 1,