lab2 some changes