complete before 8.26 to handle sessions