updated service and client