more localization work