Added returns to some of the events