update and finished lab 1