Changed some stuff
Added more stuff!