q1 and q2 added..