Moved some things out of the way