Changes on localization