Feature/book 596