lab 1 and 2 now up to date