commited tested client logic