More work on RSVP forms