Move things around to make more sense