some changes to Lab4