Added collision checks