Massive change to localization