reorg of disassembly
better disassembly