commit 6.24 9:41am