re-working entity colliding