Updated lab2 again