adding dield to the waiver
finishing the waivering logic