commit 8-25-4