further changes for multilingual