Done some changes
Done some changes