Adapted the implementation of mass~ better to how Max operates