modified to use last client
added test datz