Updated to lab 3