Reorganized lab7