Added macro update functions and reset function