- improved collisionhandling