modification for server connection