daca2: refactoring