first round of code adaptations for miniAOD