Fix 2-d oscillation by adding a collision behavior
Add rubber-banding