added srv functioniality - not tested..