Finish lab6-4 and update lab6-4