updated to new assembler