Added conditional compilation of mass.