Finish 9.6.1 - 9.6.9