commit 08/30