Changed finished action to event