commit 12-22