Minor modification to client