US79445: reorganizing v2 sample code