Made changes per John