Moved some things around to make some things faster.