updated EAP diagrams (still unfinished)