Thesis: Chapter 4 improved, EAP diagram modified it looks better now