new locale stuff
merge