macro rework