Made lab7 changes