Made some changeMade some changes