Added Correct server finder