simplify RnP flow