finishing on demand diagram generation