Feature/book 819