Assignment07 finish