First version with stub annealing.