added q2 and corrected q1