merged in the client