Small changes for Localization