Feature/book 563