Begin improve macro system