Final changes to Lab4