Change RSVP and added validation