Feature/book 601