Complete dr1 refactor, need execute test.
DR1 Procedure test OK.
Now need to refactor DR2.