some changes and lab2