Changed to use external server