Feature/book 858