Change the colliders management

And few other things