changes some things around!