updated for CMSSW_5_3_23