Feature/book 1038