update to lab2
merge