Added tollerance and collisions