added support for velocity