first commit 1-7