Added conditions for renewal and returning cancellations