Latest version after revision including diagrams