[atrt2] My recommended changes