Added collision detection!!!!!!!!!!