added q2
fixed q2
added q3