Better ms (8/19)

Better ms