Throw in some more save-excursions
Merge