updated rsvp logic