Tiny changes from RP