changed some things
changed things