Added two macros