Improved reward/bonus calculations