added waiver setup