Changes to the client