first commit for locale solution