More work toward converting Gen III -> V