updated for CMSSW_ 5.3.16