Feature/book 612