Updated AT 2 w.r.t. new toolselector menu.