tweaking to work with discreet servers