more modifications
added server