pavo: repaired collision detection and collision response