STORY-24 Added polygonal shapes as possibilities.