Updated working algos