Started modifications for localization