J.W. completed code for a2q2