more macro modification