added timer in all macros