Update shell and the client logic