Collision problems detected. Under fix.
???
Revert "???"

This reverts commit 2736d56cdc39f4288f70807572504fc680bca931.
Revert "Collision problems detected. Under fix."

This reverts commit 0360bfbb913ac0e7f26c5021e652eed9a51e9eff.