lab7 and assn4 changes