Added work for q2