Changes on collision detection