Feature/book 558