diagrams added & others renamed