commit 6_08_1