commit 6_08_2