[TW157] - Some AT changes.