Refactoring: Bonus, not current working