Move to EE7