update lab 06 and cha07