Consolidate into single version for both G5 and G4