Optimized the eventing further to avoid massive amounts of events for no reason.