Made changes per Eric