Continued working on the session timeout client/server code