remove the reliance on atqb