Very hard refactoring!!