JH client/server added