Refactoring main engine - 2million iterations..