refactoring, no complete, no debug
new structure