Design changes from client.