Changed s.name from grit to gollum