commit 8/25/14