updated q7, lab3