Added WIP-client