A new closure, ROSSMIX 2.0, for the effect of meso-scale eddies in non-eddy-resolving ocean models is presented and evaluated. It combines aspects of several previous closures in a simplified approach: local linear stability analysis is used to predict the vertical and lateral shape of eddy correlations, while a wave energy equation co-integrated in the ocean model predicts their amplitudes. The new closure is implemented and evaluated with good success in an idealised channel model of vertical and lateral shear instability, and in a realistic quasi-global ocean model.