Fixing up GR derivation