I changed some things