very close to fixing the long divergence problem.