updated to reflect latest improvements from book-club