Integrated ZexorZ's localization updates