Feature/book 673 jhon