Re #6709 the rest of the algorithms