Modifying collision

Hi Guys @trexx00 @chinmaywanpal @mpln91 @ruhavi 

Please look up the new changes for collision and start testing by downloading this branch.
Thank You