removed dependcy on velocity