Improve zone collision detection