Changed macroing system.