Edison/hopper changes.