Updated speed calculations