Demo
Add waivers