some more changes to lab4