improve for localization