commit 38 updates and changes