commit 2:53pm 10/17 from hotfix