new fields (procent of good, count of good) + refactoring