Revert "DisAsm merge"

This reverts commit 27339d88d360c4c652abd64d4c4a4511ea019277.
Revert "Revert "DisAsm merge""

This reverts commit 203bff89f5ca8eda2979076f3c957007e982a47e.
Really big improvements