updated for lab2 stuff