commit 12-24