J22/T-override update