updated serviceservant to deal with any