added q2diag2