commit 8-27-2