Improved most cases