adopted to new session filter