sync: implementing new macro system