added 2 client handling