Update for AQ to fix some bugs