Improve and change locales not working yet