Update to new Intercessor way.