integrated the session timeout change