Add custom events based on Brad's suggestion