Changed some stuff
Changed more stuff