refactoring to english version