separate out the types of donut graph
Merge branch 'master' into mass_prepare