Refactoring+ translate + bugfixing