Updates to YMB and RSVP