final commit for lab 3.1