work on both AQE and AQS new pages; trying to align them as much as possible