Update RPG listener to bring it to parity