Updated Speed Calculations