Rewritten Event Manager