DRI refactored