Made changes per John 24 July