Algos improvement