changing some things around