Updated Waitlist Functionality