Adapted asm code to new ISA