Change needed for G4