Added grid-based collisions