HQ AO hack
cherrypicks