Collisions has been Improved and bug fix