DP17..DP32, refactoring complete