Keeps getting better, but still not done.