Corrected MACROSES for EPIT - now they work correct