another try at switch over in field names