Made changes to incorporate feedback