Feature/book 592