update RSVP functions
merge