Feature/book 627