Feature/book 434