changing some things
fixed merge