New (simpler) algorithm and workflow