Adding some changes