Updates to labs 1 to 7