Update and separate msim patches