Made changes for lab6