DP06, refactoring