Shuffled some things around