more changes for session refresh