added lab 2 stuff