Feature/book 877