Changed some things, added some things