Experimental algorithm changes