commit 12/7