Making the rsvp work a bit better