Updated for lab 3