Diagrams added + some changes