Reconfigured the ordering of doing 2d FDR to drastically speed up that step