Masons ditches lockstep for merit-based system