consolidated aqsm into one file