refactor, add bonus class