Cleaned code
Raw new event creation