Update aaq and simplify everything.: