Made changes per feedback