Major Update

IMPR: Q after AA (untested)