Include velocity as well