commit 8-25-2