restructured and added lab2