Adding support for zero velocity