Re #6485 Lots of save algorithms