DP03, refactoring