Now includes new dffr_a