Speed measurement has been added. Need testing!