Feature/book 575