add velocity support