2nd commit- Fixed the codes.