The client application code had been improved to fit better to the real
case