Updated to complete entire lab