added client handling partly