Made changes as suggested by kelly