UPDATE: included more stuff for msc-dm