last changes for lab 7