22-06 Amending 17-01