made changes as suggested by users