more progress, visitor doesnt crash as often