Feature/book 854