EE - Structure changes