made 'server' an optional parameter through all scripts