Made changes as requested