Feature/book 956