Tweaked q9 and q10 for agreement with AG