update with the new $server argument :/