Made changes per John 18 Jul