shot1 commit 2