Bonus question enhancements