Changed RSVP to make it more user friendly