minor changes trying to prevent collisions