Continued working on bonuses in BonusHandler