reoganised macros
removed event action