agendas: sum more refactoring.