Should we change the Waiver Draft?