commit 2_06 morning