Waitlist works a bit better now