switched nested fields to company