Improved localization