From cmssw 6 2 1