Changes to the client to make work

Changes to client to make work.