refactoring core engine
6.1.0 :D