major refactoring, increased eval score with > 0.3%