Updated to work with CMSSW7XX