Localization & highlighting Complete