Change how Velocity is calculated as mentioned in #478