updated algos
resolved merge conflict