added server and tpl stuff