added some more changes to lab2