major commit 8/11/14