implementations after the revision with the client