Updated assembler