Add Curve Detection and Velocity Detection