update No.8 & finish No.2