Finish q2 in Assignment