Add no.disassemble and criterium + formatting