updated name_grabber
merge conflict resolved