WIP: Use new algorithm