added lab2 stuff