more work integrating donuts into contours