#7. Now handles multiple servers