Refactored and fixed IR & DF methods