Debugged Diagram with new internal Functions