Feature/book 628