added collide checks