No. For new F and J admissions, D/S is replaced by a fixed admission period. Those already here on D/S get a phased transition.