Shuffled some macros around