final changes to lab2