New summarizing + refactoring