commit 12/4