Adding some changes in