lab4
removed hoops
lab3
merged