Feature/book 740