Improves the diagrams part.
Merge with Thomas update
Commit