Changed some things..