Adding collision management

Adding collision management