Better ms (17/19)

Better ms