adding in server optionality