Modified code and Localization