moved some things around