BOOK-852, making more generic