Collision improvment

Collision improvement