Sort out + assembler reconfiguring