Optimized upwind performance