updated order of events