Final updates for lab 2