DP05, refactoring