Slightly modified event system