updated with class changes to lab2