add 21_1
Merge branch 'feature/21_1'
update point deduction for 23_1