Reordering events to ensure data is loading