Changes to gatherer