i18n refactoring.... looks unstable