Changes to macro