Moved stuff from TE and AE to fit 1.7