Added a good part of the client