final changes for aq 7