Re #6485 Two more of save algorithms