Feature/book 618