Replace salvage with redone code

See comments on your latest commit