Tweaks to MASS example