initial changes to client