Feature/book 624