JG: small changes