Made some changessss