initial changes required for i18n system
simplify