Made speed calculation current speed instead of average speed.