wrap up commit 7/25