moved some of the registers to new style (Macro based)