Move waiver to graphics