Changed the order of the #define's, it makes more sense this way.