added macroses