Finish issue-6-1 double check

double check progress: 100%