Fixed calculation of average speed
Use average speed as graph value
Advanced version for release