revert to using MASS