Better ms (18/19)

Better ms