Feature/book 620