Edits to match new naming; temporarily commented out state collector;