updated service servant to deal with any