Feature/book 611