Bounty-system-revamp