Feature/book 573