Improved exit criteria