Second part book/doctrine review/update