improve method
First client - WIP