refactoring and build ver 1.4