q1 almost done; q2 done;

for q1 the q values don't work. We don't know what they should be