adding back disassembly