moving some things around