Update with recent reorgs