Diagrams added + stuff