Improvements for the Calc Path algorithm