Moved in the AOA part of the driver