separated v17 codes; selective updates