Reworking payout logic