more progress on disassembly