update for new rbp patches