New logic for server checking