q2 added. q1 revised.