two new books and a refactor