design tweaks for handoff to RP