Feature/book 1019