Improve Localization