change macro syntax to use & instead of @