little adjustment
add i18n support
temp