using the right fields because we want parity.