added server side stuff