Updated lab06&hw06