added revised Client
merged