For future portability reasons MIT is moving all macros to function