Implemented WAIVER propagation, but not debugged