Update macro and script