changed some things
changed some things