Revised geometry #2: even more consistent algorithm