Added waved circle/regular polygons