And.... changed so that only declared fields are included.