Making all changes for lab7 submission