More work on converting Gen III to V