updated collision checks