changed q1 and q2