RSVP and more changes