new version of the swirl to reflect new fields