Improved localization slightly