combiled version based on ntuple v2