Final commit 9.8