Better ms (7/19)

Better ms