adding in locale support