Changed some stuff here too ;)