modified for extra servers