Ej 6 & 7 finished