Final Diagram Drawer version