alg update
another merge