adapt to new client