Feature/book 799