Feature/book 722