Changed and added some things