refactor af divergens