Made some changes on stuff yo