Reverted the calculations of the top speed, fix dir change