Update #8.5

update #9 will be done at the end of this month