Better ms (3/19)

Better ms