Some collision detection added