Improve localization