Added collision detector
T1
Added colission detector
Conflictual?