initial changes based on client.