Feature/book 585