Final changes to lab7