Separate setting recovery from traversal
Amending previous commit