US5995: Further AT changes