Fix Collision Detection to use Velocity