Tweak event sharing section again