DEBUG : Collision major BUG + Clean code