updated version for i18n