Change CollisonManager to Thread & fixed issues