Added changes suggested in repo collab