Collision detecter improved

Merge conflicts solved :)