6/23 2nd client modified