added locale stuff again