Updated, and improved custom events