Improvements on diagrams