commit 6-14-14