Refactoring: incomplete drl, dslr
implementation completed