Updated to use #define