Changed Client format #2