EA with Archi
Merge branch