Changes to assembler