little modification of client