Add q21 to q26