- Redeem function improved