Fixed problems integrating the new algorithm. We should be ready to go.