changed minor client handling