simpler macro modification