finish changes for RP roadmap