Slight change to mode setting string for stability
Changed measure to not use mode param