Modified Collision

Hi @mpln91 @chinmaywanpal @trexx00 

Please download this modified branch for the testing purposes. 

Thanks