Feature/book 616