Feature/book 622