Updated localizer code