Mass update

21a is a vast improvement on on 18