Updated to new algorithm, but still broken.