localization changes
Localization implementation