commit 17-2