Update event after suggestions from @sveinnfannar