Modified code for a client (I suppose).