Better ms (4/19)

Better ms