manual changed!!!
 - code refactoring...