localization and validation changes