updated stuff from lab1 to lab2