edit lab6, finish lab7