Formatting
Updating eventing logic