Moved around some bits.