Rearrange order of events to take advantage of natural block update