Changed assembler things