added Dr. Moores macros