Improvements on new Diagram