More algorithm changes