Journeycalculation improved