#110, pie & donut data structure changed!!!