Feature/book 584b