Adding more realistic collision detection