Feature/book 638 639