Upgraded to latest Macro Paradise M3