Improved stopping