Feature/book 597