Some reordering trying to deal with all the timing issues.