Further algo-impl improvements