//modified to lab3