Feature/book 589