deleted old q1 and q2